Merge
Read in facilities for PPA file started
Merge branch 'master' of https://github.com/jlehtoma/zonator