removing commons-io dependencies temporarily
Merge branch 'develop' of https://github.com/Netflix/astyanax into develop

Conflicts:
	build.gradle
fixing gradle merge
deleting 1
fixing the merge
Merge branch 'master' of https://github.com/Netflix/astyanax into develop

Conflicts:
	build.gradle
additional unit tests and refactoring
Merge branch 'master' of https://github.com/Netflix/astyanax into develop
Merge remote-tracking branch 'origin' into develop
moving info to debug
Fix NPE with EntityManager.find() and optional fields
Merge pull request #317 from jlewark/develop

Fix NPE with EntityManager.find() and optional fields
 resolve conflict