Added accept-ours/accept-theirs alias
Ignore .gitignore by default
Configured lightline.vim
Changed zpretorc config
Added vundles.local.vim
Added a git template