temporary commit to save changes

author: nhhughes
Merge branch 'start-of-refactor' of http://github.com/SixAppeal/wpi-suite into start-of-refactor

author: nhhughes
Merge branch 'start-of-refactor' of http://github.com/SixAppeal/wpi-suite into start-of-refactor

author: nhhughes

merging yum's most recent changes to the code
Merge branch 'start-of-refactor' of http://github.com/SixAppeal/wpi-suite into start-of-refactor

merging troy's changes into mine.

author:nhhughes
newest changes to local cache

author: nhhughes