bump base and tweak upgrades
Merge branch 'fixes/upgades' of https://github.com/racker/virgo into fixes/upgades

Conflicts:
	base