Merge branch 'hotfix-issue32'
Merge branch 'devel'
Merge branch 'master' of https://github.com/quintusdias/glymur
Merge branch 'master' into devel
Minor cleanup.
Fixed #26, fixed #36
Merge branch 'issue26' into devel
Bumping to 0.1.7
Merge branch 'devel'
Reordering documents, make api go last.  Fixes #25

Should revisit this, is it a bug in sphinx?
Merge branch 'hotfix-issue25' into devel