Merge pull request #1609 from Kenneth-T-Moore/bench

Fixed a couple of bugs with finite differencing boundary variables in Andrew's tower model.
fix gui filemanager test, Windows doesn't always assign mimetype for python
Merge pull request #1614 from swryan/gui

fix gui filemanager test, Windows doesn't always assign mimetype x-python
Fix to a conmin test