Update .gitignore and stem3.cpp to allow compilation on my local machine (needed <iostream> include)
Merge branch 'convert2cfg_patch'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Enhancements to QMB
    * added shift rotate buttons to model tuning section to allow for easier shifting of atomic model
    * added interactive view of currrent model zone axis
    * reorganized layout (with GUIDE) to make things a little cleaner
    * added graphical button labels for shift buttons, rather than simple text ones (purely an aesthetic change)

Getting myself up to date

Cleaned up GUI and added zone axis controls and offset buttons (not implemented in qmb.m, yet)

A couple QMB improvements:
* Implemented XY offset and rotation buttons to allow for easy model moving.
* Also added a display for the current Zone Axis, which updates with other parameters when switching grains

Revert "Getting myself up to date"

This reverts commit 80c1bce938e200956dfba8efffdb857691ede468.

Revert e53f04dcd90fd58b56e5bc504d7a7c656682c245

Updated buttons with graphical arrows in qmb.fig (with GUIDE)