Commit all this stuff now, in case I can't do it later
Merge branch '1.1' of github.com:stal888/Poison into 1.1