Updated vagrant success instructions to match HACKING.md
added defaultcharset to apache global config
added polling to functional test to wait for servers to start
added 10 second timeout to _wait_until_up
cleaned up loop
Merge branch 'develop' into add-polling-to-functional-tests
Merge pull request #314 from jacksingleton/add-polling-to-functional-tests

Add polling to functional tests
Merge pull request #305 from pamo/develop

Updated vagrant success instructions to match HACKING.md
Merge pull request #312 from dolanjs/utf-8-encode-global

added defaultcharset to apache global config
Merge branch 'develop' into simplify-dev-setup

Conflicts:
	setup_dev.sh