Sass cleanup and formatting

Cleaned up formatting and organized files, minor changes
Minor version update
Merge remote-tracking branch 'origin/development' into gh-pages