updated for ls april 2014
Merge branch 'master' of github.com:webberist/servers