Actual repository commited
Fixed conflicts in vimrc
Various insignificant changes