Merge branch 'master' of https://github.com/brandonlamb/Spot

Conflicts:
	lib/Spot/Adapter/Mysql.php
	lib/Spot/Adapter/PDO/Abstract.php
	lib/Spot/Config.php
	lib/Spot/Entity.php
	lib/Spot/Entity/Collection.php
	lib/Spot/Mapper.php
	lib/Spot/Query.php
	lib/Spot/Relation/HasMany.php
	lib/Spot/Relation/HasManyThrough.php
	lib/Spot/Type/Float.php
	lib/Spot/Type/Integer.php
	source/Spot/Adapter/AdapterInterface.php
	source/Spot/QueryInterface.php