Merge "Adjust to upstream buck and new bucklet version"

.buckconfig

diff --git a/.buckconfig b/.buckconfig
index 78b3922..f143d0e 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -5,9 +5,6 @@
   mvn_install = //:install
   mvn_deploy = //:deploy
 
-[buildfile]
-  includes = //bucklets/java7.bucklet
-
 [java]
   src_roots = java, resources
 

.buckversion

diff --git a/.buckversion b/.buckversion
index ea13b51..cec726d 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-ca48f0fff22f7fbcb856fd2faa6e15e7de900775
+1ba4496a782b40dec33a42e69a74837afee06177