changed 'tricks' to 'behavior' & extended conditions
Merge pull request #54 from neuromusic/tr-conditions

changed 'tricks' to 'behavior' & extended conditions