Bad merge fixes
Merge branch 'master' of github.com:aaronware/FoundationPress