Mini 2 Merge

[planes]

Pull Request Checklist

• Merge in the latest Develop branch changes to your branch
• Remove .pyc files from your repository:
  • Linux/Mac
    • find . -name *.pyc -delete
  • Windows
    • del /S *.pyc
• Run automatic regression and makes sure everything is passing
• Did you make a new regression test that covers your new code?
• Did you update your docstrings?
• Did you update your headers to include your name and date?
• Do a final compare with the Develop branch to be sure what you're changing

[coveralls]

Coverage decreased (-0.007%) to 71.055% when pulling 0a9a2c4 on develop into 63f860b on master.

[JTrentSmart]

All changes are necessary and appropriate