WBL : Add .iml to .gitignore
Wouter : some more refactor