Merge remote-tracking branch 'upstream/master'
Make my linux-mode function interactive
Merge branch 'master' of github.com:sixpi/prelude