Merge branch 'master' of github.com:bendudson/BOUT
configure failed, had to use make.config I made by hand at some point
Merge branch 'master' into pybout