Just debugged some problems with using gpg-agent, and have switched back
to gnome-keyring, this explains the changes to bashrc and bash_aliases.
Turned off flymake for elpy, disabled ede mode because it was screwing
with auctex keybindings (and I don't like it anyway).