Merge branch 'feature/142' of github.com:8r2y5/StarryPy into feature/142

 Conflicts:
	tests/test_plugin_manager.py

Author: 8r2y5

tests/test_base_plugin.py

@@ -9,7 +9,7 @@ def test_mapping_override_packets_dont_include_base_plugin(self):
         with self.assertRaises(AttributeError):
             base_plugin.overridden_packets
 
-    def test_activation_defactivation(self):
+    def test_activation_deactivation(self):
         class TestPlugin(BasePlugin):
             pass