Replace arcp with arcs on .bash_aliases
Merge branch 'master' of github.com:notmii/.files

Conflicts:
	.vimrc
Fix merge error.