Updated sig traps
Merge branch 'dev' of github.com:tommyjohnson/ditto into dev