Add ASP CI with Travis, SensioLabs Insight, Scrutinizer. Fix critical SensioLabs violations. refs #58
Fix merge conflict