Merge branch 'master' of ssh://github.com/draftbit/variable-json

# Conflicts:
#	package.json

1.1.0