Blue Waters improvements
Merge branch 'master' of github.com:leeping/etc