stuff
Merge branch 'master', remote branch 'origin/master'
Merge branch 'master', remote branch 'origin/master'
Merge branch 'master', remote branch 'origin/master'
 ff
 bug fix for get_contributors, and tablefactory
merge