Cleaning lib directory by default on `grunt coffee`
Travis CI YAML
Adding grunt-merge
Don't need dynamo branch
Merge branch 'master' of https://github.com/winton/node-template

Conflicts:
	.travis.yml
	package.json