Dont want .iml around.
Merge remote-tracking branch 'origin/master' into origin
Getting going :p
Merge remote-tracking branch 'origin/origin' into origin