Setting up new collections
Modifying nav behaviour
Setting up new collections
Trying out a new post layout system
Merge branch 'develop' of https://github.com/tomsturge/tomsturge.github.com into develop

* 'develop' of https://github.com/tomsturge/tomsturge.github.com:
  Setting up new collections

Conflicts:
	_site/README.md
	_site/index.html
	_site/page2/index.html
	_site/page3/index.html
	_site/post/index.html
	_site/post/site-update-a-journey-with-jekyll/index.html
	portfolio/index.html
	portfolio/index.md
	portfolio/teaching/index.md
Relocate SASS files
Add gruntjs automation
Optimise images
Update gitignore
Fix merge conflict file renaming
Update js minifying
Add css source map
Update nav
Update copy
Optimise Gruntjs config
Fix portfolio page
Updated gitignore
Untrack _site/ files
Streamline homepage template
Rearrange homepage IA