Merge branch 'dev'
Merge branch 'master' of https://github.com/browndav/vm-toaster
Ignore staging directory.
Fix proxy timeout issues on high-latency connections.

Credit to: Milan Andric <milan@medicmobile.org>
Fix incorrect version number.
Merge branch 'dev' in to 'master' for 5/22/2014 release.

Conflicts:
	staging/packages/.gitignore
Revert server-api nginx.conf changes for this branch.

We're going to keep these in `dev` for the time being; the next MMVA release
will include the server-api support (after we solve the issue of not being able
to install apps via the dashboard, i.e. add a special rule so that everything
unser `/dashboard` goes directly to the `couchdb` proxy target).
Use correct path for ntpd logs when not on VMWare.
Don't mistakenly copy a home directory in to itself via a symlink.
Actual fix: don't copy home directory in to itself via symlink.
Fix SFTP subsystem; strengthen server key and policy.
Merge branch 'dev'

Conflicts:
	packages/medic-core/settings/medic-core/nginx/nginx.conf
Move file for merge.
Merge branch 'dev'
Name change: `kujua-transport` to `medic-transport`.
Restora `kujua-api` support.