Reworking the device detection methods
Merge branch 'master' of github.com:noorus/nil

Conflicts:
	include/nil.h
	src/Device.cpp
	src/System.cpp