add python, jinja2
remove python, jinja2 from site.pp
update
add python, ec2 tools
Add ec2 tools!  Merge remote-tracking branch 'rvoraboxen/master'

Conflicts:
	manifests/site.pp
//added anne's comment and took all changes from Rvora