@derdon can you push these changes separately (leave the fails on travis stuff) because they keep failing on my machine and it's annoying ;)