Merged with master
cache
Merge branch 'master' into curriculum
created zoho data validation function as well as ZohoDataError exception class.  Tests are included in user.tests.py
added templates for all our includes that are repeated in Splash
switched the pages over to use the new templates; added MouseFlow
Merge branch 'html-templates'
added page-specific javascript back
Modified user.models
fixed the bug Jason found: views now resize onresize event.  see resize function in controllers.js
Fixed foreign key relationships
add optional arg to signup form (used first on the learn-python landing page) to handle 'course' to include in potential; send that course to Zoho and CIO; add tests for everything.
Renamed to how it works
Merge remote-tracking branch 'origin/master' into github_pages_bugfix
remove changes to user/tests.py that are to be released from the origin/zoho_check_script branch
Changed code for updating courses/curriculums
Merged
Merge branch 'curriculum' into databasing
Merged
added social buttons to front-page