sync with pytrick repo
Merge branch 'master' of github.com:thismachinechills/webspade

i done goofed