Merge branch 'release'
removed some things
modified git ignore and add javascripts back
tests are working now
update version of scala for travis
removed jdk6 from travis file
Merge branch 'master' into release