Moar refactors...
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/PixelPyros.xcodeproj/project.pbxproj
Got the windowed version compiling

(although it can't seem to load anything… :-/ )