Corrected bug in contour plot; added new functionality for orbital plot
Merge conflict resolved