Tweaks and fixes.
Merge branch 'master' of https://github.com/andres-montanez/Magallanes

Conflicts:
	Mage/Task/Factory.php