Added back some stashed stuff
Merge branch 'master' of https://github.com/whiterson/mockingJay