Update README
Merge branch '12.04' into dc-12.04

Conflicts:
	README
Minor bug fixes.
Merge branch '12.04' of https://github.com/DemandCube/vagrant-ubuntu into 12.04