Merge pull request #157 from varon/master

Fix for issue #156
fix for #158
removed pointless interdependent type from ServerKey
Merge branch 'master' of github.com:suaveio/suave
Reworked the parsing functions to reduce duplication