spark shell enhancements
reorganized things a bit
merge with remote