pep8 fixes
added unit test for mcsolve with collapse operators and states output
use average_states to get something that can be used with the expect function
added unit test for testing both expect and state output using Options(store_states=True)
code cleanup. removed unused code.
added unit test for expect+states output for case with no collapse operators
support for state+expect output for no-collapse operator case
simplify code for no-collapse operator case (get rid of a lot of setup code that is not needed)
simplify output setup code
cleanup code: simplify arguments
more code cleanup and some pep8 fixes