For #378 - nixing upgrade section
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
For #378 - edits to bring in recent Backbone changes into the basics section, minor updates to appendix
Merge pull request #394 from dcmaf/gh-pages

Minor tweaks to recent updates, added discussion to go with new diagram
Adding updated rails mvc diagram
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Mobile application chapter clean-up.