Simplified configuration processing.
Merge branch 'next' of github.com:maidsafe/MaidSafe into next