don't add spurious merge commits
use 1.8's copy-pipe
remove dead code
configure macvim font/airline in macvim vs. terminal vim