Merge branch 'feature/bash_env' of https://github.com/dwimsey/storm into bash_env