master
Remove use of preinst-swig script
The great merge
Trim trailing blank lines
fix SWIG naming convention
rename java run tests from main to runme for consistency across the languages