Merge branch 'master' of https://github.com/WMD-group/Eris

# Conflicts:
#	src/eris-kernel.c

src/eris-kernel.c

@@ -557,4 +557,4 @@ static void MC_move_dE_check_stencil()
         //REJECT move; doesn't need to do anything, just update REJECT for
         //stats
         REJECT++;
-}
+}