Updated things
Decoupling some stuff
Merge branch 'master' of git://github.com/creolab/krustr