made matplotlibrc work in mac
merged
merging
removed leftover from merge
few updates for mac