components CONFIGURE_ENV and COMPONENT_OPTIONS cleanup
Enable CONFIGURE_ENV and CONFIGURE_OPTIONS in configure.mk
Merge branch 'oi/hipster' of https://github.com/OpenIndiana/oi-userland into transforms

Conflicts:
	components/php-5_4/Makefile
Merge branch 'oi/hipster' of https://github.com/OpenIndiana/oi-userland into transforms
slang CONFIGURE_OPTIONS cleanup
Switch LINKER to gcc for correct LD_BITS
Restore mistakenly deleted CONFIGURE_OPTIONS for xscreensaver
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
Merge pull request #211 from xen0l/oi/hipster

Enable stunnel and libtecla update
Update Lua to 5.2.2