This is mostly ported as-is from 0.x but contains updates relevant to GitHub and removes bits about Storyboard. Change-Id: Ib38a413a2927e3b4cfcb9dbfb24d528c99be7657