Update templates/pre-commit-hook

fix `ruby: no code specified for -e (RuntimeError)` error
Adding Ruby 2.0 to the travis build
Merge pull request #51 from zzet/patch-1

Update templates/pre-commit-hook
Add a pry check for ruby files

https://github.com/pry/pry
Merge pull request #52 from samadhiBot/master

Add Pry Check
Update changelog.md
Update README.md

just made sure merge_conflict is actual config value
Merge pull request #53 from mikedfunk/patch-1

Update README.md
Update README.md
Update README.md

Hmm... where did I copy this badge from? :P