Change the main stylesheet's extension from CSS to SCSS
Start using SCSS variables
Start using SCSS nesting
Minor variable cleanup
Use more SCSS variables
Merge branch 'master' into jekyll-2

Conflicts:
	style.css