Tidied up navbar and welcome message
Tidied up navbar and welcome message.
Merge branch 'master' of https://github.com/dawner/drist

Conflicts:
	app/controllers/delivery_processor.rb
	app/controllers/mails_controller.rb
	app/views/static_pages/home.html.erb
	db/seeds.rb