Added some server hookups. Sexy.
Merge branch 'develop' of https://github.com/ingenology/nero into develop