Changes for James Waite

Changed various user aspects to better suit the man behind Western Film,
James Waite!
Merge pull request #1 from tau-wu/master

Looks good!  Gonna make a couple more updates to keep the versioning consistent, so just have a wee look through those afterwards.