Merge branch 'release/1.1.1' into develop
update django version in travis and tell travis to join researchcompendia channel instead of hackingscience channel
Add primitive verification api for executing code
Merge pull request #170 from researchcompendia/runslice

Add primitive verification api for executing code. part of #140
Use year-based urls
Provide a year-based compendia view
Merge pull request #171 from researchcompendia/yearbasedurls

Provides year-based compendia detail urls
fix stdin/stderr typo
add fields for course compendia
add buttons for courses and books
migrations for courses and book columns
allow user to add files for courses and books
add comment clarifications about the currently stubbed out verification call
added commenting and social features

commenting and social features. Isn't passing make test, but that
doesn't seem to connect to my changes.
Merge pull request #172 from researchcompendia/commenting

added commenting and social features
pass parameters around
Merge pull request #173 from researchcompendia/csvparams

passthrough parameters to verification lib
Merge pull request #176 from researchcompendia/customlook

Provides a few new fields for different types of files
disqus key is changed and now is an environment variable
disqus key is changed and now is an environment variable