Merge pull request #226 from cmurphy/master
authorMorgan Haskel <morgan@puppetlabs.com>
Mon, 29 Dec 2014 19:22:00 +0000 (11:22 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Mon, 29 Dec 2014 19:22:00 +0000 (11:22 -0800)
Add IntelliJ files to the ignore list


Trivial merge