Chrubuntu changes
vimrc changes
Merge .gitmodules