Merge pull request #1 from thefryscorer/master

merge changes from JoelOtter & kunev
add iTerm2 support
capitalisation is a bitch
Merge pull request #4 from duckness/master

adds iTerm2 support