merged zkasmi/makefile_fixes to makefile_windows_fixes

Resolved conflicts from https://github.com/RIOT-OS/RIOT/pull/93