a lot of changes to the dotfile- may have slowed things down...
Merge branch 'master' of github.com:ifiokjr/dev-env

Conflicts:
	dotfiles/.bashrc
	dotfiles/.tmux.conf