added test files
Remove java-specific code from Makefile
Merge branch 'master' into ritesh
Code review for selecting plots to display and
enabling return key for description editor.