Update to have gitignore
Merge branch 'master' of github.com:contiki-os/contiki
Merge branch 'master' of github.com:contiki-os/contiki