I dunno
Merge remote-tracking branch 'chris/master'
Readded missing tests folder, even tho that's local only
Merge remote-tracking branch 'dan/master'