Merge pull request #87 from DavidVorick/server

Lots of organization
Merge branch 'master' of github.com:Siacoin/Sia into server
fix build