changed a few things

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>
Merge branch 'master' of github.com:tower/server

* 'master' of github.com:tower/server:
  0.1.1