Some style fixes
Merge branch 'cli' of github.com:maidsafe/MaidSafe-Common into cli