have paster serve --reload reload when html template files are changed
Merge remote-tracking branch 'origin/bootstrap' into bootstrap