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
Add i18n headers to `style.css`
Merge pull request #75 from michaeldcain/master

Add language pack headers to `style.css`
Update theme name.
Fixes #74
housekeeping stuff
merge upstream changes