production config for MongoHQ on heroku:production
Merge pull request #12 from josmas/master

Config changes for heroku
Merge branch 'dev_urbanite'

Conflicts:
	Gemfile.lock
Merge pull request #18 from josmas/master

Version currently deployed in heroku
Remove redundant 'event_' field prefixes for events, update `rake db:populate` to use more fields
Add  and  rake tasks
Add bootstrap; Explicitly define gem versions
Add updated Angular from Jos's commit
Add layout from Jos's pull
Add config from Jos's pull
Merge branch 'add-bootstrap'
Removed redundant 'event_' prefix from Angular view
Update README.md to explain database rake tasks
Fixing conflicts