general cleanup
cleaning the house up
minor reorganization
Merge branch 'master' into json_decode
moved json_decode.ex to json/decode.ex