Merge pull request #59 from thewheat/master

Change gradle build to target Java 1.6  (Java 7 omods incompatible with CI)
Get most tests working. Order tests so add is first test to ensure data exists