Merge branch 'master' into dev
adds ability to start server with custom www_root

This commit was sponsored by pebble {code}
http://pebblecode.com
Merge pull request #117 from hoodiehq/dev

adds ability to start server with custom www_root