initial merge of maxim/bootswatch-rails 3.2.0