Bug fix for not overriding aliases
Code cleanup
Added phpcs to travis