add some vimrc stuff
store vimrc from work
fix merge conflict
Merge branch 'master' of https://github.com/arcin/dotfiles
add git secret and update zshrc