diff --git a/CMakeLists.txt b/CMakeLists.txt
index 390904c58e1e4ebd1f8a9c4e1337014f7676d173..7e4a21d1b7632aadfe565cd1642b4cb7bf72d26a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,12 @@ if( (NOT MOOSE_VERSION) AND GIT_EXEC)
     file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
 elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) )
     message(STATUS "+ Reading ${VERSION_FILE}" )
-    file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT )
+    if(EXISTS ${VERSION_FILE} )
+        file(READ ${VERSION_FILE} MOOSE_VERSION )
+    else()
+        string(TIMESTAMP MOOSE_VERSION "nightly-%Y%m%d" )
+        set(GIT_VERSION_OUTPUT "nightly" )
+    endif( )
 elseif(MOOSE_VERSION)
     message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" )
     file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
diff --git a/Makefile b/Makefile
index 5dda459827e9ab9c719b762b9e19946bd0ab0daf..3df49b3d6716d97edac4b4b4f31b66f12f55e8db 100644
--- a/Makefile
+++ b/Makefile
@@ -273,12 +273,12 @@ endif
 
 # Here we automagically change compilers to deal with MPI.
 ifdef USE_MPI
-	CXX = mpicxx
+	CXX = mpicxx --std=c++11
 #	CXX = /usr/local/mvapich2/bin/mpicxx
 #	PARALLEL_DIR = parallel
 #	PARALLEL_LIB = parallel/parallel.o
 else
-	CXX = g++
+	CXX = g++  --std=c++11
 #	CXX = CC	# Choose between Solaris CC and g++ on a Solaris machine
 endif
 
diff --git a/pymoose/CMakeLists.txt b/pymoose/CMakeLists.txt
index af4e8e749a827b113267d557ba89f7071277ff14..cd7de488f0d9b7630c7bf242eaefc6e036582af4 100644
--- a/pymoose/CMakeLists.txt
+++ b/pymoose/CMakeLists.txt
@@ -93,8 +93,6 @@ endif(MACOSX)
 add_custom_target(copy_python_files ALL
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         ${CMAKE_SOURCE_DIR}/python ${CMAKE_BINARY_DIR}/python
-    COMMAND ${CMAKE_COMMAND} -E copy 
-        ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_BINARY_DIR}/VERSION 
     COMMENT "Copying required python files and other files to build directory"
     VERBATIM
     )
diff --git a/python/setup.py b/python/setup.py
index a6c3852c787d09e3d59d8b03ba82c359759e8f11..475826a54e32a25fdbf6e64181d8fbe08ec3eb6f 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -33,7 +33,7 @@ from distutils.core import setup
 
 script_dir = os.path.dirname( os.path.abspath( __file__ ) )
 
-version = '3.1'
+version = '3.2.git'
 try:
     with open( os.path.join( script_dir, '..', 'VERSION'), 'r' ) as f:
         version = f.read( )