Update Oneiric links
Merge branch 'master' of git://github.com/shaftoe/vagrantboxes-heroku into shaftoe-master

Conflicts:
	www/index.html