Example configs moved.
Merge branch 'joyent/feature/smf/2013Q4' into joyent/release/2013Q4
Update 'joyent' and 'wip' submodules.