Removed uneccesary file for IDE.
Merged in latest master changes.