Refactoring started
more refactoring
finishing refactoring
Major cleanup
Merge branch 'refactoring'

Conflicts:
	app/_layout.jade
	app/admin.jade
	app/index.jade
	app/lib/settings.coffee
	app/server/app.coffee
	app/styles/client.styl
	package.json