make most debug output conditional
Merge branch 'cc2520-hardware-aes' of https://github.com/renehummen/contiki into cc2520-hardware-aes
fix broken merge