pull request for all commits to my fork's master branch

Hi gesman, here's a pull request for my fork's master branch (ie. all of my commits to this project).  You should be able to accept the pull request and github will handle the rest.  But it'd be a good idea to review all the commits I've made first.

Thanks,
Tim