0.11 travis fixes

I'm trying to figure out why we have some tests failing on node 0.11 on #91 so I'll use this PR for that. E.g. expect some temporary commits etc