Merge pull request #1 from lievcin/develop

Adds rvmrc to gitignore
Merge branch 'develop'
added pg to gemfile