Added in bootstrap. Not yet fully integrated.
Fix breaking test
Merge branch 'master' of github.com:controlshift/prague-server