Lots of general cleanup done.
Made changes to .gitignore.
Re-added .iml.