Merge branch 'patches/cleanup'
Merge remote-tracking branch 'upstream/master'
Shutting down controller first
Merge pull request #326 from cdburkard/patches/nets

Switched shutdown order to kill controller first