Updated dependencies and uppped to Java 1.7