Add combine.py, meant to do all comining in one, work in progress
Merge branch 'master' into gh-pages