Fixes for credentials
Merge branch 'master' of ssh://github.com/jwbartel/research-tools