SmartOS fixes, HAProxy 1.5.3, tinc 1.1-git, and some package updates

This is the cleaned-up version of: https://github.com/NixOS/nixpkgs/pull/2117
Nasty typo, will fix, thanks!