Fixes issues with parcelables and the modle objects.
Merge pull request #37 from matthewrice345/parcelableFixes

Parcelable fixes