Removed duplicate class hiearchy.
Fixed a bug with building queries using selectRaw(...).  Bug #166.