Merge
Merge branch 'master' of https://github.com/meitcher/sphincter-war
Merge branch 'master' of https://github.com/meitcher/sphincter-war