added ~/bin to path
Merge branch 'master' of https://github.com/awfki/dotfiles

Conflicts:
	bashrc