I think if your environment just got messed up because of some VCS merging or commit errors, which is my case, i would suggest you just re-import your porject and add it to the root of your VCS to restore the project. If you use a VCS like git or subversion, you'll simply have to add your project to the root of the given repo and everything should be back to normal. This worked for me though.