added an atom feed link for questions
Merge pull request #137 from khinds/master

Added atom feed link to question index
fixed pagination formatting of disabled buttons and current page
Merge pull request #138 from khinds/master

fixed #136, pagination controls are now properly formatted
Fix for CVE-2013-0156
update rails due to the two CVEs
[ci-skip] added @jrgifford to the broke build list.
added my email for travis-ci notifications
Merge pull request #140 from khinds/master

Added Qkhinds to the travis notification list
fixed .travis.yml conflict
Revert "update rails due to the two CVEs"

This reverts commit 72af831087cd1a6aca065047d048eadccd369476.
Rolled back @steveklabnik's commit, updated rails, ran specs. YAY SECURITY UPDATES! :metal:
use ruby 1.9.3
Merge pull request #142 from jaredmoody/master

Use ruby 1.9.3
Upgrade devise to 2.2.2, closes #141
Add another_blog_post fabricator
Use blog_index_path since blog_index does not exist
Specs for BlogController
Merge pull request #144 from pbjorklund/blogcontroller_spec

Added tests for blog_controller and fixed a path
Updated rails