Merge pull request #13 from Tribex/widget_types

Widget types - Keep master up-to-date
Documented three classes.
Deleted an offending file (that I had; Tribex didn't).
Nothing really. I just have to commit to see if that will fix the
problem with merging.
Merge pull request #14 from Tribex/widget_types

Changes to import system to make it more flexible, other misc changes.
Merge branch 'Nateowami-master'
Merge branch 'master' into widget_types