Merge branch 'master' into prod

Author: nicksloan

resources/location.html

@@ -41,7 +41,7 @@ <h2>Venue</h2>
                 <a href="http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=120+3rd+Avenue+South+Nashville,+Tennessee+37201&sll=37.0625,-95.677068&sspn=34.724817,68.554688&ie=UTF8&hq=&hnear=120+3rd+Ave+S,+Nashville,+Davidson,+Tennessee+37201&ll=36.162652,-86.775212&spn=0.008211,0.016737&z=16&iwloc=A">Map</a></p>
                 <h2>Hotel</h2>
                 <p>We've arranged a great deal for our attendees at the <a
-                    href="http://www.hilton.com/en/hi/groups/personalized/B/BNANSHF-PHP2-20110420/index.jhtml?WT.mc_id=POG">Hotel
+                    href="http://www.ichotelsgroup.com/h/d/in/1/en/advancedsearch?whichtype=room&roomResult=none&hotelCode=bnaus&quickRes=city&_GPC=PH1&_requestid=874427">Hotel
                     Indigo</a>! For just $129 per night, you'll be located right
                 in downtown Nashville just a few blocks from the conference
                 venue. In the evenings, we'll walk around downtown and entertain