first bit of code. wip.
Merge branch 'master' into featured-images
featured images working for all page templates