doc: merge guide 2 with guide
doc: guide edits in-line with suggestions from geojeff
Merge pull request #1027 from kivy/doc_move

doc: merge guide 2 with guide