Error handling
Merge branch 'master' into error-handling

Conflicts:
	app/index.js
Merge pull request #309 from mozilla/error-handling

Error handling
makes tab styling more universal so we don't have to keep writing styles for it
adds the admin settings layout and updates styling for tabs
WIP commit
First pass at user admin for realz
0.0.24