Updated to newest version of gulp-traceur
Merge