Removed Windows support from makefile, cleaned up.
Merge branch 'dev'

Conflicts:
	Makefile