Merge branch 'master' into bye-bye-github

This commit is contained in:
Arfon Smith
2016-11-03 20:09:02 -04:00
40 changed files with 10341 additions and 2591 deletions