Merge iterm support

Closes #50

I thought I'd play with it a little and basically just moved the `set b2d ...` lines so they could be common to both terminals