Improved Makefile
Merge branch 'master' of git://github.com/jrivera777/OpenGL-Asteroids into jrivera777-master

Merging changes from jrivera777
Making merge of branch jrivera777 cleaner.
Missed some minor semantic changes in the merge fixes.
Removing mac support until we can figure out how to make it work in 10.7 and
less and 10.8 because of the header renaming issue.
Merge remote-tracking branch 'upstream/master'