Commented vimrc and merged differences from moss