Merge pull request #1 from nonhermitian/mcsolver_updates

Mcsolver updates
added function serial_map to qutip.parallel, which has the same function signature as parallel_map and can easily be swapped with parallel_map
move progress_bar.finish to after pool.join to avoid ipython zmq problems
unit tests for serial_map
Fix seeds being reused error and a test for this
Merge pull request #275 from nonhermitian/mc_solver_fixes

mcsolver fix
Merge pull request #2 from nonhermitian/master

Merge pull request #1 from nonhermitian/mcsolver_updates
Merge pull request #277 from nonhermitian/mc_solver_fixes

Mc solver fixes
Revert "Mc solver fixes"
Merge pull request #278 from qutip/revert-277-mc_solver_fixes

Revert "Mc solver fixes"
fixed progressbar with parallel_map in mcsolve
resolved merge conflict
Merge remote-tracking branch 'origin/parallel-updates' into refactor-mcsolve-parallel
remove unnecessary warning
code cleanup, use num_cpu spec in options for parallel_map. fallback to serial_map if num_cpu is 1