Merge pull request #3 from instructure/master

Update 11-5-14
Stop tracking .iml files
Update gradle
Merge pull request #90 from joshuadutton/master

Stop tracking .iml files