HG-63 some style cleanup
Merge pull request #72 from Wikia/HG-63-graceful-error-handling

Hg 63 graceful error handling
Merge branch 'master' into HG-63-graceful-error-handling

Conflicts:
	views/layout.hbs