Python stuff.
Still python stuff.
Git stuff.
Merge branch 'master' of github.com:trq/my-boxen

Conflicts:
	modules/people/manifests/trq/applications.pp