Upgraded to grunt 0.4.0
Other minor modifications.