locked down what a client can and can't do
Merge branch 'master' of github.com:adnissen/bursts