Finished major reorganization
changed tag in setup
misc edits
added numpy/scipy notebook
minor edits
added workshop notebook
Merge remote-tracking branch 'upstream/master'