updates and such
Merge branch 'master' of https://github.com/encephalopathy/wepwep