gruntfile tidying
Merge branch 'dev'
Removing some unneeded files