Add `git mergetool` alias to eshell
Fix cider-mode leader mappings
Setup Travis CI
Remove elpa task from Makefile
Disable email notifications from Travis CI