Correct param docstring format
Merge branch 'master' into development
Merge pull request #14 from johnwlockwood/development

Correct param docstring format
Use iter's sentinel arg instead of infinite loop
Merge branch 'master' into development
Merge branch 'development' into unicode_io
Renamed io.py to unicode_io.py
Write unicode documentation