Pulling in latest
Bringing in latest pure master
Improved conditional for loading child theme style.css
Removing redundancies and deleting superfluous stuff.
Merge pull request #99 from drywall/master

Fixing bug with child theme style.css