Revert "Merge branch 'master' of github.com:joschabach/micropsi2"

This reverts commit 814a4b7e7d33634c71580ee666132ba3a60dc9a9, reversing
changes made to b3c3b98fedb4ec6bf292f59afa101ed272d9c39e.