Fixed CSS and JS conditional load.
Merge pull request #23 from pjackson28/master

Fixed CSS and JS conditional load