cleanup
Fixed faulty docstring
Added xlrd as dependency
Resolve conflict
Merge branch 'master' into trystuff