bootstrap changes.
Merge remote-tracking branch 'origin/next' into sqlite

Conflicts:
	src/maidsafe/vault/vault.cc
fixing a typo from previous merge
updating bootstrap changes
Merge remote-tracking branch 'origin/next' into sqlite

Conflicts:
	src/maidsafe/vault/vault.cc
	src/maidsafe/vault/vault_main.cc
minor typo fix
removing new_bootstrap_contact handling
MSVC compiler warning fix.
Removed #include for unavailable Routing file.
Merge remote-tracking branch 'origin/next' into sqlite
Removed another instance of routing::BootstrapContact.
Merge remote-tracking branch 'origin/next' into sqlite