Removed test-code (now in branch wip)
Merge branch 'wip'
JSHinted gulpfile (and fixed), removed unused deps
Removed redundant dep
Merge branch 'master' into wip