More changes to nav, a few which bubble over to elements.
Merge branch 'completed' of github.com:fourseven/gitshop into completed

Conflicts:
	app/assets/stylesheets/_variables.css.scss
	app/assets/stylesheets/modules/_buttons.css.scss