Merge branch 'middleman' into assemble2

Conflicts:
	.gitignore
	README.md
Merge branch 'master' into assemble2

Conflicts:
	README.md
wintersmith and grunt working together
push
stash