deleted q1d_otto_merge.py after copying functions into q1d_*.py
Minor changes and bugfixes