Fix conflicts
Merge branch 'master' of github.com:aqson/exim

Conflicts:
	Makefile
	bower.json
	exim.js
Update Readme, tests
Merge pull request #4 from aqson/master

Change names