Merge branch 'master' of https://github.com/jarped/ionosphere
altered tabulation
removed internal servernames, more tabulation
Merge branch 'master' of https://github.com/jarped/ionosphere