some marginally better styles
Merge branch 'master' of github.com:JohnAmican/merch-perch

Conflicts:
	app/views/events/index.html.haml
littel style fix