WIP:
Merge branch 'refactoring' of github.com:gzagaris/cosmotools into refactoring

Conflicts:
	Makefile
Merge branch 'refactoring' of github.com:gzagaris/cosmotools into refactoring
ENH: Adding framework to Makefile build-system