3.1 Turned in for Review

See README for issues and questions, if problem with the tagged version
just download from the live repo, I don't generally commit things that
break the site too badly.