fix warnings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/lib/log.h
	src/switch/switch/parse-options.c
	src/switch/switch/switch-init.c
Update bundled gems.
Merge pull request #91 from trema/feature/update_bundles

Update bundled gems.
Merge branch 'master' of https://github.com/trema/trema-edge into develop
Merge remote-tracking branch 'origin/develop' into develop