updated readme to match other branches/repos
Merge branch 'dev' of https://pupil.googlecode.com/git into dev

Conflicts:
	README.md