Behaviour conditions

Merging behaviour conditions.

The core of the work for behaviour conditions has been completed. I will now work to build some views for editing behaviours (this will be awesome for testing, and make the app feel more complete)