minor fixes and pull in changes from RIOT's master

@bapclenet This PR provides some minor style fixes and introduces all the changes from RIOT's master since you opened the PR. After you merge it, squash my marked commits, test again and push it to you github repo and leave me a note in this PR. I think we can merge it then. \o/