Last-minute commit as I clean up archibald.
Merge branch 'master' of github.com:ppham/super-kitaev