Merge pull request #1 from browndav/dev

Merge vm-toaster development branch in to master
Merge pull request #2 from browndav/dev

Periodic merge: Development branch stabilized; merging to master
Major improvements to supervisor start/stop code.
Merge branch 'dev' in to branch 'master'.
Merge startup fix from branch 'dev': workaround for bug in busybox find(1); ensure success of supervisor_reset.
Merge from branch 'dev'.
Merge from branch 'dev'.
Remove old patch.
Update patches for linux 3.7.5.
Merge from branch 'dev'.
Adjust gardener cmd for new format
Merge pull request #5 from ryanramage/gardener-1.0.0

Adjust gardener cmd for new format
Merge branch 'dev'. Satisfies pull request #6.

Conflicts:
	initrd/etc/group
	kernel/dot-config-3.7.3-pax
	kernel/dot-config-3.7.5-grsec
	kernel/dot-config-3.7.5-stock
	kernel/dot-config-3.8.2-stock
	kernel/dot-config-3.8.4-stock
	kernel/dot-config-3.8.5-stock
	packages/concierge/software/concierge/v1.0.0/server.js
	packages/gardener/scripts/gardener/run/gardener
	packages/medic-core/scripts/medic-core/install
	packages/medic-core/scripts/medic-core/private/gammu-monitor
	packages/medic-core/scripts/medic-core/run/gammu
	packages/medic-core/settings/medic-core/gammu/autodetect.conf.template
	packages/vm-tools/scripts/vm-tools/run/vmtoolsd
	source/Makefile
	source/linux
	source/medic-core-1.2.0/usb-modeswitch
	source/medic-core-1.2.0/usb-modeswitch-data
	source/patches/grsecurity-2.9.1-linux-3.8.2.diff
Remove no-longer-needed setup script.
Merge branch 'dev'
support gardener 1.0.3 with logdir switch
Merge pull request #7 from ryanramage/master

Support gardener 1.0.3
Fix quoting.
Merge branch 'dev'

Conflicts:
	packages/gardener/scripts/gardener/run/gardener
Merge pull request #26 from browndav/dev

Stable: merge development branch in to master