Fixed reference to settings file in publish.php that was causing upload errors.
Fixed display issue with article inside article inside ul's being floated left
Fixed header and footer injection display on settings page
Merged with upstream
Fixing merge conflicts
Merge pull request #113 from codevinsky/master

Fixes #73, #100 and #103