Add some slight design tweeks
Merge branch 'master' into kf-small-design-changes

Conflicts:
	css/city.css
	css/common.css
Merge pull request #5 from baseballhackday/kf-small-design-changes

Add some slight design tweeks -- and conflict resolved