add travis status to readme
Update java target to 1.7 (known to compile on 1.6 as well)
Merge branch 'master' into gh-pages