Merge branch 'middleman' into assemble2

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

Conflicts:
	README.md
wintersmith and grunt working together
push
stash
update resume
update
update
cleanup
added new article
2nd article
doc files, cleanup
doc files, cleanup
personalization
update stash
update reademe and article
jade pages, coffee plugin, readme, resume.md
stash
stash
made pdf resume right