Intermediate changes from bard
Merge branch 'master' of github.com:toddfoster/config
More bard reconciliation
vundle update