Merge remote-tracking branch 'upstream/develop' into new_notebooks

This commit is contained in:
Adam Nelson 2017-03-09 09:22:25 -05:00
commit 4b01fd3114
36 changed files with 1206 additions and 1365 deletions

File diff suppressed because one or more lines are too long