BK-1014 Use hashes to make substitutions more obvious
BK-1253 Add BeautifulSoup to requirements and regenerate pybundle