Allow passing "none" as --bootstrap_file arg to indicate no override file should be used.
Merge branch 'next' of github.com:maidsafe/MaidSafe-Common into next