More consistent variable escaping; updated gitignore.