Merge pull request #1 from abiwebmanager/master

Initial tidy up to after first site commit.