Installed ember and generated bootstrap
Fleshing out new location form
Beginning to implement google maps locations
Merge branch '30b42283f38cc62e5c8011d760859e55dced12fa'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/cilantro.js.coffee
Merge branch 'master' of github.com:chrisdfe/cilantro