Gulp

#299 resubmitted again develop to make it easier to read the diff
Should 'test' be added as well?