Adding adding to_json, making it pretty
Merge branch 'master' into rm/pretty-json

Conflicts:
	lib/skywriter/template.rb
Merge pull request #16 from otherinbox/rm/pretty-json

Adding adding to_json, making it pretty