Clean up small issues found during a review.

- Make the Makefile idempotent when building the environment.
- Change an invalid import of twisted.internet.deferred to defer in the
  README.
- Make the project compatible with buildout 2.0+.
- Fix some style issues.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
	bootstrap.py