merge in flatly by bootswatch (because we like it) and make some changes