Refactor dirs
Fix DataMapper key bug (Fixed #73)
DataMapper findOne should return Data object. Fixed #74
Merge branch 'windwalker'

Conflicts:
	AbstractDataMapper.php
	Tests/DataMapperTest.php
	Tests/Stubs/data.sql