Modified attribute merging and configuration options, fixes #85 and fixes #86
Added unit spec for x509 authentication