Upgraded to grunt ~0.4.0
Merge remote-tracking branch 'upstream/master'