initial commit
Removed experimental features
Merge branch 'master' of https://github.com/williamholland/Tiamat