Revert "Merge branch 'master' of github.com:andypiper/marvellous"

This reverts commit 0280c276e91e45dbed4515d44ee6098763a2525f, reversing
changes made to 206299fb4ed650c33424ef819bd6733e88bb2b2d.
more ignoring