standardize on two-space indentation
Merge branch 'more-configuration'
Merge branch 'master' of https://github.com/VideoBleep/bleepout

Conflicts:
	bleepout.xcodeproj/project.pbxproj
	src/core/BleepoutApp.cpp
	src/core/RoundManager.h
	src/game_objects/Ball.cpp
Merge branch 'master' of https://github.com/VideoBleep/bleepout

Conflicts:
	bleepout.xcodeproj/project.pbxproj
Merge branch 'master' into more-configuration