Start ssh-agent in bashrc
Merge branch 'master' of github.com:bananajr/dotfiles

Conflicts:
	bashrc