App::uses instead of App::import, dont use deprecated functionality, cs fixes and update travis
cs fixes
correct return type
fix remaining cs
Merge pull request #56 from dereuromark/2.3

2.3