fixed a couple issues with moral data source, general cleanup
merging in upstream
merging
merging in changes
made some adjustments to WordDataSource, general cleanup, housekeeping
Merge pull request #6 from boxenjim/master

adjusted data source methods, general cleanup