Merge pull request #206 from xen0l/oi/hipster

Some components from JDS gate
Merge pull request #207 from xen0l/oi/hipster

Add locale-related facets to iso-codes.p5m
Unbreak httping
httping: Linux comment is still unrelevant
Merge pull request #208 from pyhalov/httping

Httping
Update vim to 7.4
Merge pull request #209 from pyhalov/gvim

Update vim to 7.4
Update puppet to 3.2.2. Recent userland gate massive puppet update is not included.
Merge pull request #210 from pyhalov/puppet

Update puppet to 3.2.2. Recent userland gate massive puppet update is no...
Fix stunnel
Enable stunnel
Merge branch 'oi/hipster' of https://github.com/OpenIndiana/oi-userland into oi/hipster
Update libtecla to 1.6.2