Merge pull request #4 from modcloth/master

Lots of upstream changes for your perusal
Various administrative things (hopefully) in prep for next gem release.
Markdown tweaks after taking a look at github rendering
A few more README tweaks (now that I've read it!)
Merge pull request #5 from meatballhat/arranging-the-flowers

Arranging the flowers
Adding missing spec license metadata

Closes #6
Thanks, @bf4!
Merge pull request #7 from meatballhat/add-missing-license-metadata

Adding missing spec license metadata
Merge branch 'master' into rails-3.2-compatibility
Update readme for rails 3.x configuration