modify path to include scala
fixed bug in rvar and also resampleTop

rvar --- expressions can't span lines in scala! or at least
not if the line starts with + ... arg!

also in resampleTop had atoms where should have been atom.