forgot to commit this a long time ago
Merge branch 'master' of github.com:johnheimkes/wordpress-static-framework