Migrated to Grunt 0.4 and updated dependency versions.
minor indentation and alignment changes
Merge branch 'paazmaya-master' into dev