Fixed more merge errors
Merge branch 'master' of https://github.com/OSU-Net/cyder into Range_Usage

Conflicts:
	cyder/cydns/utils.py
Fixed dynamic interface api tests range defaulting to static
Yet another spelling error...
temp