Fixed typos.
Merge branch 'master' into david-api

Conflicts:
	hogwarts/marauder/testapi.py
Merge pull request #303 from Kae7in/david-api

David API Updates