style fixes
Merge branch 'master' of github.com:ralsina/nikola
Make bootswatch work for bootstrap 2 and 3 (#599)
Merge branch 'master' of github.com:ralsina/nikola