fix stack eliminators
add default value for groupby
add simple macro support
add macros
Merge pull request #35 from lifey/master

macros and more