Changes to the delay functions

Changed to a much simpler delay_us and added a timer based delay_ms
Merge branch 'master' of https://github.com/duselbaer/msp430lib

Conflicts:
	CMakeLists.txt