clean up
Merge branch 'master' of git.openmole.org:openmole
Merge branch 'master' of git.openmole.org:openmole