Force jinja2 to be 2.6 so it works on Python 2.5
Kinda figured I'd run into quote problems
Minor language tweak re: fabfiles.
Merge branch '1.6'