Stuff from mac
Merge branch 'master' of https://github.com/kotowick/Term7

Adding stuff from mac
mac updating..