Updated git settings
Updated vimrc
Deleted old puppetrc