Move away from macros
Added *.swp to gitignore
Updated readme