Added MakeMachine mathod to factory.
Factory methods for charms and services.
Add unit methods to factory.
Update style, some code changes.
Comment updates.
Factory improvements - style fixing.
Merge pull request #358 from tasdomas/factory-improvements

Factory improvements

Added methods for creating charms, services and units to the testing factory.