cleanup
Merge branch 'master' of github.com:jpata/AnalysisModules

Conflicts:
	.gitignore