Fix ValueError message
Reenable retries
fix up bugs
fix bugs
Merge remote-tracking branch 'upstream/develop' into sam_20141204

Conflicts:
	salt/transport/__init__.py
Merge remote-tracking branch 'upstream/develop' into sam_20141204
Fix lint errors
Merge pull request #18738 from SmithSamuelM/sam_20141204

Fixed bugs in raetlane.py. Added changes to transport