Committed some things from jander
Merge branch 'master' of https://github.com/heimel/InVivoTools