Upgrade middleman to latest 3.3.1
Consolidate some CSS