initial commit
Merge branch 'master' of https://github.com/simonmcwhinnie/custom_post_type_framework.wordpress