local changes from work
Merge branch 'master' of github.com:sjahl/dotfiles
Merge branch 'master' of github.com:sjahl/dotfiles
some cleanup, adding ace-jump locally because the one on marmalade is sad, and commiting some local changes