Moar aliaz
Alias for no-ff merging
jshint changes