- Moved core tests
    	- Added lib/dir
    	- Added test-run.js
    	- Run test-run.js on make test
	- remove junk file
	- fix merge derpage
	- Fix merge conflicts
	- fixed merge conflicts
	- fix merge conflicts
Merge remote-tracking branch 'max/master'
Merge remote-tracking branch 'max/master'
Merge pull request #53 from teebrz/master

Test runner, etc