Got some basic global settings working (homepage blurb)
Merge branch 'master' into admin-interface
Testing
testing
Still working on trying to fix heroku push
Merge branch 'master' of heroku.com:glacial-hamlet-3515 into admin-interface

Conflicts:
	config/initializers/default_settings.rb
Maybe this will fix the heroku push
Updating seeds