Tidies up R macros
Reconfigures package including getting rid of shortcuts.R