Merge & Cosmetic changes
Merge branch 'cleanup-wip' of github.com:EIT-ICT-RICH/contiki into cleanup-wip