Sass stuff, style fixes
Merge branch 'develop' into gh-pages