commit of some gui stuff.
Merge branch 'master' of github.com:curtisullerich/butterflies