Add bin/scripts to path + misc small changes
Merge branch 'master' of https://github.com/qeny/dotfiles

Conflicts:
	bashrc
	vimrc