Merge pull request #34 from SpaceProphet/master

Updated Gulpfile
Merge pull request #35 from SpaceProphet/master

Changed Gruntfile.
Edited travis.yml