- Updated to Java 1.7 template syntax
- Removed unused code
- Added additional test (file relative load using 'url' in JSON)