start splitting out code
Merge branch 'origin/master'

Conflicts:
	templates/_middleware/blog.js
Merge branch 'origin/master'