two python3 errors crept in
jsonPickle -> fromPython
slight license clarification
update license
layout -> namedTuples
Merge branch 'master' into mei