Removed development-only travis directive
Merge branch 'development'