cleaned up logical AND shortcut spec
Merge branch 'and_token' into develop