Delete .Makefile.mac.swp
Merge branch 'master' of github.com:mesosphere/mesos-go