Add local.cfg to .gitignore
Add new bootstrap.py for buildout 2.0
Add basic robot framework tests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	buildout.cfg
Remove allow-hosts from travis.cfg
Update changes
Upgrade travis to download Plone 4.2.5 UnifiedInstaller
Add bootstrap.py update notes to CHANGES
Merge pull request #15 from saily/master

Add basic robotframework tests