add keywords to setup.py
clean up macros
bump version