All tests fixed and passing now
Merge branch 'staging' of https://github.com/SNGTRKR/sngtrkr into staging