Merge branch 'release/1.1.2' into develop
using underscores for post type instead of hyphens.
changing post type args to be compatible with PageLines
removing template intercept filters, PageLines handles that as well
version bump to 1.1.2 (pagelines fork)
Merge branch 'release/pagelines-compat'