Added edit-server, web browser, and new shell function
Merge branch 'master' of github.com:barracel/prelude