Massive UI reshuffle, cleanup, updates
Merge branch 'master' into ui_updates

Conflicts:
	.DS_Store
	app/views/saved_searches/_form.html.haml
Merge pull request #53 from rhokbrisbane/ui_updates

Massive UI reshuffle, cleanup, updates