Merge pull request #22 from keaty/master

Additional style changes
Update .gitignore
removed Gemfile.lock from .gitignore