Added config setting for live site
Merge branch 'master' of http://github.com/whizkid338/online_journal
Added Settings from live site
Merge branch 'dev' of http://github.com/whizkid338/online_journal
fiddles with settings.py