Merge branch 'master' of git://github.com/stfairy/ranch
Fix inherit listen options for accepted socket

Order of options in listen is undocumented but significant. Now user option will
replace default value if user set it.