fixing some bugs that have crept into chipwar as a result of fixing mistakes in Octo's emulation.
Merge branch 'gh-pages' of https://github.com/JohnEarnest/Octo into gh-pages