Change Makefile to use ipcluster2; added test for edit_magic