Merge pull request #59 from Sixstring982/devel

Devel
Merge branch 'trent-staging' into devel
Merge pull request #65 from Sixstring982/devel

Devel
Test --ignorethreadingproblems
Merge pull request #66 from Sixstring982/dave-staging

Dave staging
Merge pull request #67 from Sixstring982/devel

Pull changes down from Devel