Some typo corrections
Merge branch 'master' of https://github.com/SimonStreicher/LoopRank
Merge branch 'dev_active'

Conflicts:
	dataplotting.py
Deleted dataplotting.py
Merge branch 'dev_active'
Merge branch 'master' of https://github.com/SimonStreicher/LoopRank