More work on network building
Merge branch 'AFN-to-airflow' of github.com:jasondegraw/OpenStudio into AFN-to-airflow