updated to magemonkey v1.1.19, still required multistore patch in cron.php _proccess method for multistore email templates to work correctly
fixed merge conflict

Conflicts:
	modman