Bump to 1.5.4
Merge branch '1.5' into 1.6

Conflicts:
	fabric/version.py