git recent-branches - tell me what i worked on recently
Update README.md
Move vim settings out of plugins to ensure they all get correctly loaded after everything else [Fix #373]
Silence vim-session dialogs
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Silence vim-session dialogs
  Move vim settings out of plugins to ensure they all get correctly loaded after everything else [Fix #373]
  Update README.md
  git recent-branches - tell me what i worked on recently

Conflicts:
	vimrc