Merge pull request #13 from therebelrobot/master

Update README.md
force travis-ci build
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	README.md
updated readme with travis-ci
updated readme further
Merge pull request #14 from therebelrobot/feature/readme-travis-ci

updated readme with travis-ci
Merge pull request #15 from therebelrobot/develop

Merge into master