Revert "Fixing the template directory"

This reverts commit 9cadc0292aa506ebf3ceae7bac4a025f0d63611f.
Update Arduino syntax file
Change key mappings
Set indentation to C++ style
Fix whitespace
Restructure makefiles

Now there are three:

- Makefile - the template for individual project makefiles
- master.mk - the main makefile that contains most of the logic
- system.template.mk - sets system-wide variables - this should be
  copied to system.mk