throwaway
Merge remote-tracking branch 'origin' into database
Minor edits for Heroku
Merge branch 'master' into database
-Merge and added heroku functionality
-pull request enroute
Conflicts:
	log/development.log
Merge pull request #12 from fence-lizards-2014/database

spare herkou deployment instance.