Fixing up unit tests
Merge branch 'master' of github.com:dansam100/protomapper

Conflicts:
	AutoLoad.php
	tests/binds/ProtocolBindTest.php
Ignoring merge artifacts.