In progress commit
Merge branch 'master' into CleanUpNetworkController
UnitTests for the win.
Merge branch 'master' into CleanUpNetworkController
Merged from master
Merge pull request #25 from LocalStory/CleanUpNetworkController

Clean up network controller