Fixed a few things, hopefully it won't explode as often now
Prep for pull
Fixed timestep size default
Prep branch merging
Merge branch 'optimization'

Conflicts:
	Code/Project_v0.01/Project_v0.01/vector_lib.cpp
	Code/Project_v0.01/Project_v0.01/world.cpp
No more threaded things, but the option is still there