Merged changes from joakims repo.
Minor change of comment.
Removed duplicated line.
Decreased border router baud rate to make it more stable.