Bug 976535 - FTE Tutorial refactor r=fcampo, ejchen

This is ready to review!