Merge 'v0.3' into gh-pages-minimal

Version 0.3

Lotsa updates...

Merge conflicts:
	_config.yml
	assets/stylesheets/slate/custom.css