cleaning up server setup for ubuntu
Merge branch 'master' of github.com:rebel-outpost/bb_server_setup