Removed unnecessary data left in code.
Escape __ chars on image name
Remove mention of emulator from BUILDING.md
Merge remote-tracking branch 'original/master'