Updated CMake if statements in line with CMake v3.1 policy.
Bugfix in add_gtests CMake module.
Merge pull request #173 from Fraser999/MAID-500

Updated CMake if statements in line with CMake v3.1 policy.
Merge branch 'next' of https://github.com/maidsafe/MaidSafe into next
SHA stamp by Jenkins as building correctly