Changes all around
Added bashrc
Merge branch 'master' of https://github.com/maistho/dotfiles

Conflicts:
	misc/bashrc
	setup.sh
	vim/vimrc