Merge pull request #17 from noelbk/contrail

Thanks Noel! I have been thinking about making a function our of patch installation code but you beat me to it!
Fix a couple of minor merge issues