Thoughts

Merging in thoughts and travis integration