add vegas hotels to locations
Merge branch 'master' of
https://github.com/TheConnMan/AWS-Hackathon-2014.git

Conflicts:
	grails-app/controllers/org/atrocitywatch/HomeController.groovy