reviewed
fixed conflicts
Merge pull request #101 from cloudify-cosmo/review-plugin-authoring

Review plugin authoring