NuGet options
Android options
Various python options
Merge branch 'master' of https://github.com/scottmcginness/dotfiles

Conflicts:
	pythonrc
	vimrc