Merging all changes done since November 2013 tag.

This PR merges all the changes made to `master` since the November 2013 tag into `gh-pages` for use in upcoming bootcamps.