Define or and and as macros. Closes #86