Changed setup.py to require the ordereddict package only if  from collectioms import OrderedDict fails.
Reset docs to boilerplate.
Merge branch 'develop'