Removed formatting test that were breaking build.  Formatting functions were moved to the classes they applied to.  New tests will be made to test those classes.
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from stevendgonzales/master

Removed formatting tests from test_resource
fixing a minor merge conflict