Merge pull request #6 from Tolchi/master

Added pg gem and made some modification in Gemfiles.
Merge pull request #7 from Tolchi/master

added annotate gem