import refactoring
Merge branch 'master' of https://github.com/sitewards/modman-php

Conflicts:
	modman.php