Updated to JDK 7 in Travis build file
Merge remote-tracking branch 'origin/master'