Merge branch 'master' into devel
When working with 3.3, really should catch both IOError and OSError.

On 2.7, the mac seems to issue an IOError, other platforms an OSError.
Just catch both.  #123
Merge branch 'issue123' into devel
Merge branch 'devel' of github.com:quintusdias/glymur into devel
Prepping 0.5.4 release.
Merge branch 'release-0.5.4'