updated to Mockito, incorporated gradle
renamed files, patched up gitignore