Fix typos, import format for numpy, and var name
Merge branch 'issue_168' of github.com:adamrp/scikit-bio into issue_168

Conflicts:
	skbio/core/distance.py