0.6-SNAPSHOT

weird bug since we were lingering on a  non-snapshot version and it
wouldn't update
Merge branch 'master' of https://github.com/msokolov/lux
Added AbstractExpression.super
fixing the way we combine queries from predicates with the queries 
from the paths in which they are embedded.
reverted a recent patch for attributes in predicates, since this
subsumes it.
line ending weirdness again