Better Java location tracking
Made location tracking more sane
Make travis pass
Doesn't belong on master
Upgrade dependencies
Looks like we need to use ruby 2.0.0-p0.
Use older 1.9.3. Meh.
Merge with master
Tweak tests