codeship
Merge branch 'master' into feature/im-a-failing-branch

* master:
  class dir
  travis ci integration

Conflicts:
	class/Api.php