Numerous bugfixes
Merge branch 'master' of github.com:mgibbs189/facetwp-alpha