Working on fixing bugs
preparing to remove the database.yml file

Reverting "Fixing merge"
Merge branch 'origin-deployment'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
Fixes #13
Fixes #18
Fixes #19
Fixing web/publication bug
Fixes #8
Merge branch 'master' into origin-deployment

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/backbone/views/map.js.coffee