hacking away

Signed-off-by: Tom Everett <tome@criticalmass.com>
Merge branch 'dev' of ssh://git.khubla.local/mnt/git/jvmBasic into dev