use Ubuntu Emacs Lisp PPA for snapshot
revert to Cassou PPA for Emacs 24 (stable)
travis: remove emacs-snapshot-gtk package
ignore git merge files: BACKUP LOCAL BASE REMOTE
whitespace