merge in changes from #79
commita7a67715386ae36bf6be4ae94eb629cd368b608b
authorLove Hörnquist Åstrand <lha@h5l.org>
Sun, 24 Aug 2014 02:08:00 +0000 (23 19:08 -0700)
committerLove Hörnquist Åstrand <lha@h5l.org>
Sun, 24 Aug 2014 02:08:00 +0000 (23 19:08 -0700)
tree0d300b6eb053ea2c57c4f5ee1f34f7f68bb04d4e
parent394a8567fb453f4c3ba6107e668b8989f34ed00b
merge in changes from #79

fixes #79
.travis.yml