Upstream 3.2.2 changes

Merged in the changes from the 3.2.2 tag in bootswatch-rails. Fixes a few issues and adds new themes.