add nobatis and q dependencies
apply nobatis and minor cleanups
apply nobatis and minor cleanups