commitski
Committing some changes that change the UI a little bit.  I'm on the way to having file picking and loading in there.
Merge remote-tracking branch 'origin/master'