Merge branch 'master' into pygromacs

diff --combined CMakeLists.txt
index d6df9b467d59d55616ef60ac6acb6012cb536990,92809a7be67bd354652ba3b9042774a1ed78d6bb..0d956e1cd57ed67816ca23cfd7b2a9cd0c1f4028
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -158,7 -158,7 +158,7 @@@ mark_as_advanced(GMX_SOFTWARE_INVSQRT
  option(GMX_FAHCORE "Build a library with mdrun functionality" OFF)
  mark_as_advanced(GMX_FAHCORE)
  
- option(GMX_COOL_QUOTES "Enable Gromacs cool quotes" ON)
+ option(GMX_COOL_QUOTES "Enable GROMACS cool quotes" ON)
  mark_as_advanced(GMX_COOL_QUOTES)
  gmx_add_cache_dependency(GMX_COOL_QUOTES BOOL "NOT GMX_FAHCORE" OFF)
  
@@@ -498,7 -498,7 +498,7 @@@ if(NOT DEFINED GMX_EXTERNAL_BOOST OR GM
      if(NOT DEFINED GMX_EXTERNAL_BOOST AND NOT Boost_FOUND)
          message("Boost >= 1.44 not found. Using minimal internal version. "
                  "This may cause trouble if you plan on compiling/linking other "
-                 "software that uses Boost against Gromacs.")
+                 "software that uses Boost against GROMACS.")
      endif()
  endif()
  option(GMX_EXTERNAL_BOOST "Use external Boost instead of minimal built-in version"
@@@ -507,7 -507,7 +507,7 @@@ if(GMX_EXTERNAL_BOOST AND NOT Boost_FOU
      message(FATAL_ERROR
          "Boost >= 1.44 not found. "
          "You can set GMX_EXTERNAL_BOOST=OFF to compile against minimal "
-         "version of Boost included with Gromacs.")
+         "version of Boost included with GROMACS.")
  endif()
  
  if(NOT DEFINED GMX_BUILD_UNITTESTS AND NOT HAVE_LIBXML2)
@@@ -877,15 -877,6 +877,15 @@@ if ((CUDA_NOTFOUND_AUTO AND GMX_DETECT_
  endif()
  set(GMX_GPU_DETECTION_DONE TRUE CACHE INTERNAL "Whether GPU detection has already been done")
  
 +#######################
 +## Python bindings
 +#######################
 +
 +# We only set option here, actual detection goes to
 +# src/python/CMakeLists.txt due to bugs in FindSIP
 +option(GMX_PYTHON_BINDINGS "Enable GROMACS Python API bindings"       OFF)
 +
 +
  #######################
  ## uninstall target
  #######################