Cleaned up deployment tasks.
Merge branch 'develop'
Cleanup.
Adding Travis.
Merge branch 'develop'