Update etchserver.conf parsing

No longer depends on regular expressions, should be straightforward
to extend with additional keys.
Merge pull request #17 from stnoonan/master

Update etchserver.conf parsing