This follows the symlink and adds the original file to the package instead of giving you an error.
no spaces.
Merge branch 'master' into olaf/symlinks
Add support for JSON config files
Allow password to be stored in .zat cache
Bump ZAS to v1.16.1
Merge pull request #67 from zendesk/adammw/json-settings

Add support for JSON config files
Merge pull request #68 from zendesk/adammw/zat-password

Allow password to be stored in .zat cache
Merge pull request #65 from ocke/olaf/symlinks

This follows the symlink properly
Merge pull request #70 from zendesk/atroche/bump-zas-1.16

Bump ZAS to v1.16.1
v1.21.0
Updating placement of ?zat=true parameter now that real URLs are live
Merge pull request #71 from zendesk/skinney/fix_doc

Updating placement of ?zat=true parameter now that real URLs are live
Gem bump
Update spec to match rspec3
Bring in modern hash syntax
Merge branch 'master' into po/random

Conflicts:
	Gemfile.lock
	lib/zendesk_apps_tools/command.rb
Test multiple versions in Travis CI
Merge pull request #72 from zendesk/po/random

Bump stuff up