add package needed by supervisor tagged release
update to bootstrap 3.1.1 (see also #203), and use supervisor master which is py3k compat
Merge branch 'feature.multifileupload' of github.com:Pylons/sdidev into feature.multifileupload

Conflicts:
	buildout.cfg