Remove trailing comma
Merge pull request #56 from ryanathasoffers/fix_trailing_comma

Remove trailing comma
Merge master
Merge branch 'misc_cleanup' into misc_cleanup_2