Bug 960486 - Add support to flatfish device
Merge pull request #315 from dannyliang/flatfish

Bug 960486 - Add support to Flatfish device
Bug 979939 - mach bootstrap should work with pypi mach, r=jgriffin
Bug 977156 - Add capabilities for running vgdb to scripts
Bug 982465 - Use vendor device name for DEVICE in config file. r=mwu
Add support for the flame device
Merge pull request #328 from Seinlin/bug-982465

Bug 982465 - Use vendor device name for DEVICE in config file. r=mwu
Merge remote-tracking branch 'mozilla/master'

Conflicts:
	config.sh
	flash.sh