Merged some changes form neighboring branches & upgraded to Grunt 0.4.x