add support for more condition functions
Merge branch 'develop' of github.com:eukaryote/troposphere into develop