Add start-wan-join, retry-wan-join and related configuration options and commandline options
Added HTTPS support via a new HTTPS Port configuration option similar to the HTTP Port.
Change names to StartJoinWan, RetryJoinWan etc
Moved TLS Config stuff to tlsutil package
Merge pull request #477 from amalaviy/retry_wan_join

Add start-wan-join, retry-wan-join and related configuration and commandline options
Make the 'consul version' to return value that is from 'git describe --tags'
consul.Config() helper to generate the tlsutil.Config{} struct, 30 second keepalive, use keepalive for HTTP and HTTPS
consul: Increase maximum number of parallel readers
Merge pull request #480 from epankala/consul_version

Make the 'consul version' to return value that is from 'git describe --tags'
Merge pull request #478 from amalaviy/https

Added HTTPS support via a new HTTPS Port configuration option
agent: Fixing port collision in tests
agent: Fixing UiDir in test
agent: Fixing config merge test
agent: Fixing wan join tests
consul: first pass at keyring integration
consul: fix json marshaling
command: create serf dir if it doesn't exist, document -disable-keyring arg
command: warn when passing -encrypt when keyring already exists
command: add skeletons for keys command
consul: use rpc layer only for key management functions, add rpc commands