Trivial changes prior to pulling.
Merge branch 'master' of https://github.com/catalyst/basil

Conflicts:
	web.py
Merge branch 'master' of https://github.com/catalyst/basil