Cleaned up vim code
Updated vimrc