bind C-c M-k to term:kill
delete trailing whitespace whenever a file gets saved
add more stuff to prodigy
Merge branch 'master' into windows