More prep for FFOS
Merge branch 'master' of github.com:elsigh/sporecast