regular pre-pull commit
Merge branch 'master' of https://github.com/cyclicredundancy/VCX

Conflicts:
	projects/cellular_prowl/modem_driver.py
merged modem_driver.py