Cleaned up unnecessary includes

Probably renamed some variables to be more descriptive, I don't remember.
Got rid of broken windows.h include
Merge branch 'master' of https://github.com/lobabob/Rasware2013

Conflicts:
	SPRobot/Main.c