Moved the maze stuff around
Merge branch 'two' of github.com:mackorone/mms into two

Conflicts:
	src/maze/MazeFileUtilities.cpp
	src/sim/Maze.cpp
Moved some things around, cleaned up a little code
Removed old comments