small changes to Mavin, error listening
Merge pull request #13 from silasoverturf/master

update feathers branch