remove untested stuff
Merge branch 'master' of git://github.com/MageHack/elasticmage