move remote snippets into the faking it section
Merge remote-tracking branch 'origin/master'