Build housekeeping
Merge branch 'master' into scala-2.10

Conflicts:
	README.md