ignoring .idea dir
Merge branch 'master' into rackspace