Merge pull request #4 from kpartlow/master

Added in more formatting options and writing out types correctly.
- added code to place commas at the end of strings in json format
- remove unused imports
- removed unused methods
- repackaged test groovy classes to more realistic folders
Updated formatter with better Object[] handling. and better method and template handling