added Travis CI pin
added Travis CI pin
Attempted fix re: #593
Changelog re #593, fixes #593
Merge branch '1.6'

Conflicts:
	docs/changelog.rst
Tone down the nohup pitch in FAQ, it rarely works nowadays
Merge branch '1.6'
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'
Print abort and warn messages in red/magenta

This makes them much easier to spot, and to notice when your fab failed.

This fixes (the easy part of) #923.
Add colorize_errors to env and the docs and everything
Add my name
Tweak changelog entry
Tests re #924
Merge branch '924-int'
prevent 'template_dir = None' from being passed to apply_lcwd function
Add test proving #912
Changelog re #912, fixes #912