git aliases: conflicting; branch diffs
remove unused things
coffeelint tweak