Feature: configuration for node tasks other than grunt
Merge branch 'master' of https://github.com/mattjmorrison/capistrano-django into mattjmorrison

Conflicts:
	capistrano-django.gemspec
Merge pull request #6 from williamsbdev/master

Feature: configuration for node tasks other than grunt