Ignore *.swp files
Fix the mesos master/slave containers