simplified based on fgeorges comments.  may want to make more specific later (i.e. not allow @query-at w/o @query)
simplified based on fgeorges comments.  may want to make more specific later (i.e. not allow @query-at w/o @query)

git-svn-id: 2dbaadbaf98ca174f7b0d7d7583b0de64790c4d8@151 7466eb41-2b56-0410-9bce-5946398f495e

lovullo/xspec,lovullo/xspec