style.css: remove unseen mergeconflict stuff, general cleanup, use assets.tchncs.de for font-awesome+bootstrap