Merge pull request #71 from Dwaligon/develop

#44 Unit Tests for Settings and ImageUtils
pulling in new stuff.
merged
Fixed broken tests.
Added some tests for Proximity manager.
Added tests for the camera man.
Initial test of actor branch.
Just a check-in since I'm doing a lot. Modified collision detection and
added actor.
Another checkin. Built the components.
One last checkin. Refactored the character factory to remove excess
creation. The components now set the properties of the entities.
Updated Entity with calls to actors. Closes #77
Got everything except the collision detection rolling again.
Fixes #78 but there is now an issue with jump that I'll have to track
down.
Fixes #79
Updated readme.
Updated version number in the setup.py