Adds modman and magneto-debug
merging