shuffle stuff in emacs init to make initialization work better
add tmux switch session script
remove references to rbenv and add git annex alias
Merge branch 'master' of github.com:aronasorman/dotfiles

Conflicts:
	.emacs.d/init.el