Clean up Custom Post Type example
Merge remote-tracking branch 'upstream/master'
Load `scaffolding` text domain
Merge pull request #73 from michaeldcain/master

Clean up custom post type example