diff --git a/.gitmodules b/.gitmodules
index 008c801..79feab6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "googletest"]
 	path = googletest
-	url = git://github.com/hazelnusse/googletest-svn.git
+	url = git://github.com/hazelnusse/googletest-git-clone.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea4d69f..14d00f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,16 @@ cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${BICYCLE_SOURCE_DIR}/cmake/Modules)
 
 option(BUILD_SHARED_LIBS "Build shared libraries." ON)
-option(BICYCLE_BUILD_TESTS "Build tests." ON)
-option(BICYCLE_BUILD_EXAMPLES "Build examples." ON)
+option(BICYCLE_BUILD_TESTS "Build tests." OFF)
+option(BICYCLE_BUILD_EXAMPLES "Build examples." OFF)
 option(BICYCLE_BUILD_DOXYGEN_DOCS "Build doxygen documentation." OFF)
-option(BICYCLE_DOXYGEN_MATHJAX_USECDN "Use cdn servers to host MathJax (overrides BICYCLE_DOXYGEN_MATHJAX_LOCAL" ON)
-set(BICYCLE_DOXYGEN_MATHJAX_LOCAL "" CACHE PATH "Location of MathJax javascript library")
-option(BICYCLE_BUILD_PYTHON_EXTENSION_MODULES "Build extension modules for Python" OFF)
+option(BICYCLE_DOXYGEN_MATHJAX_USECDN
+    "Use cdn servers to host MathJax (overrides BICYCLE_DOXYGEN_MATHJAX_LOCAL"
+    OFF)
+set(BICYCLE_DOXYGEN_MATHJAX_LOCAL
+    "" CACHE PATH "Location of MathJax javascript library")
+option(BICYCLE_BUILD_PYTHON_EXTENSION_MODULES
+    "Build extension modules for Python" OFF)
 
 # Set g++ compiler flags if GNU C++ compiler is being used
 if(CMAKE_COMPILER_IS_GNUCXX)