preferences works sans tokens
merging preferences to maseter
updating a few errors from merge
Merge pull request #38 from bace135/master

preferences should work (almost)
Revert "preferences should work (almost)"
Merge pull request #39 from Tundra-Python/revert-38-master

Revert "preferences should work (almost)"
Merge pull request #35 from xue0chao/master

Current server operations should be included
Revert "Current server operations should be included"
Merge pull request #40 from Tundra-Python/revert-35-master

Revert "Current server operations should be included"
Fixing conflict 1
with offset
Merge pull request #42 from Warrenty/master

with offset
Revert "with offset"
Merge pull request #43 from Tundra-Python/revert-42-master

Revert "with offset"
Merge branch 'master' of https://github.com/Tundra-Python/AppetEYES