More fixing of $ issue
Merge pull request #291 from bauerca/master

More fixing of $ issue
Merge branch 'master' of https://github.com/assemble/assemble into issue-page-replace-286

Conflicts:
	tasks/assemble.js