Flatten diffcalc.ipython.parser into diffcalc.ipython - #32