Minor changes to make compilation more reliable in Eclipse.
Removed a define that was added trying to track down indexer error.
Merge branch 'master' of https://github.com/hamspot/HackAmp.git