Ignore IntelliJ files

Ignore files used by the IntelliJ IDE
Add Gemfile.lock as needed by Heroku
Merge pull request #1 from andrewdavidmackenzie/feature1

Feature1 for heroku