Merge branch 'master' of https://github.com/aaberg/sql2o into aaberg-master

Conflicts:
	core/src/main/java/org/sql2o/PojoResultSetIterator.java
	core/src/main/java/org/sql2o/Query.java
	core/src/main/java/org/sql2o/ResultSetIteratorBase.java
	core/src/main/java/org/sql2o/reflection/PojoMetadata.java