function names changed as discussed in pull req
Merge remote-tracking branch 'origin/devmap' into devmap

Conflicts:
	salt/modules/devmap.py
function names changed as discussed in pull req