Moved build output to dist/, simpler gulpfile
Merge remote-tracking branch 'origin/master'