Fixed up Custom_Post_Type a little
Merge branch 'master' of github.com:lipemat/mvc-theme