use emacsclient instead of just emacs
bash: heroku stuff + extra git aliases
fpc
emacs changes from calavera
bash: fixed pythonpath