ref(cache): remove confd from deis/cache
fix(controller): don't encode empty JSON objects or arrays as strings

The django-json-field 0.5.5 package has a bug encoding empty JSON objects.
Instead use a subclass which fixes this as a special case.
Merge pull request #1616 from mboersma/1563-fix-empty-json

fix(controller): don't encode empty JSON objects or arrays as strings
Merge pull request #1628 from deis/fix/no-confd-in-redis

ref(cache): remove confd from deis/cache
chore(tests): update etcd to match CoreOS 402.2.0

https://github.com/coreos/etcd/releases/tag/v0.4.6
chore(docs): update Sphinx reqs and remove pexpect
fix(docs): silence header warnings and restore broken links
Merge pull request #1640 from mboersma/fix-sphinx-links

fix(docs): silence header warnings and restore broken links
Merge pull request #1638 from mboersma/update-etcd-tester

chore(tests): update etcd to match CoreOS 402.2.0
fix(controller): store limit fields on config

Having a separate "Limit" domain object was getting in our way, when
really it represents just an extension of a Config. This moves the
two JSON fields "cpu" and "memory" to Config and does away with Limit.
fix(controller): specify dicts as defaults and guard against old errors

We should have been initializing our JSONFields with dict objects, not
strings. Also upgrading from a slightly earlier version of Deis to this
change could hit a JSON encoding error, so catch that and use the chance
to clean up the data. Also reverted the unnecessary workaround of
subclassing JSONField.
test(docs): add a `make test` target
docs(community): add policy on bounties
Merge pull request #1630 from mboersma/1613-limit-is-config

fix(controller): store limit fields on config
Merge pull request #1650 from gabrtv/bounty-policy

docs(community): add policy on open source bounties
chore(controller): update djangorestframework to 2.3.14

Several months of cleanup and bug fixes to a core Deis library:
https://github.com/tomchristie/django-rest-framework/compare/2.3.13...2.3.14
fix(builder): disallow password authentication

Ref: #1340

Replaces the previous password prompt with an error message similar to:

    kamina ~/tmp/deis/example-go (git:master) ✔
    ❯❯❯ git push deis master
    Permission denied (publickey).
    fatal: Could not read from remote repository.

    Please make sure you have the correct access rights
    and the repository exists.

Ideally we would brand this with a Deis-centric message, but for now
this should be good enough until we overhaul the builder completely.
sdasd
Merge remote-tracking branch 'upstream/master'
fix(builder): don't reload cedarish if its already loaded

Ref #1643

Also add log messages