Merge with latest bootswatch

2nd merge, this one deletes two files.