Ignore IntelliJ dirs
Merge remote-tracking branch 'origin/master'
Vagrant: Setup Storm & Zookeeper using Puppet