Added Travis.ci integration
Conflicts resolved
Merge branch 'master' into version-0.5
Merge branch 'master' into version-0.5
Merge pull request #81 from clearsightstudio/version-0.5

Merging branch w/ random commits ahead of master
Merge pull request #82 from clearsightstudio/version-0.6

Version 0.6 branch -- merge into master
Merge branch 'master' into version-0.7