add idris mode
Merge branch 'master' of https://github.com/onthestairs/emacs.d
some improvements
merge
fix merge conflict