something i dont like
Merge branch 'master' of github.com:magus0219/unicorn

Conflicts:
	.project
	unicorn/framework/config/config.pyc
Merge branch 'master' of github.com:magus0219/unicorn