Switched tests to use Catch.
Minor cleanup.
Merge remote-tracking branch 'origin/next' into catch

Conflicts:
	src/maidsafe/passport/tests/passport_test.cc
Updated Catch test target name.