Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop

Took saltnado.py from 2014.7 wholesale during merge conflict, so that should be correct.
I think I resolved most of the conflicts caused by @jfindlay and @cachedout as well. We'll have to re-do their work on `develop` manually.