setting up the config stage
Merge branch 'v0.5.0' of https://github.com/assemble/assemble into v0.5.0

Conflicts:
	package.json
fixing jshint errors and cleaning up some tests