Merge pull request #1 from lawlesst/master

Update fork from original
Replace OpenJDK 7 with Oracle Java 7
Merge pull request #12 from aviggio/master

Replace the default OpenJDK 7 install with Oracle Java 7