added .bash_aliases
merge .vimrcs