update for glorious pwnage
Merge branch 'master' of github.com:aroman/rebellion