Merge branch 'master' into development
Correct travis yaml file name
Add travis config
Install all dev reqs in travis
Merge branch 'master' into development

Conflicts:
	.travis.yml
Merge branch 'development' of github.com:johnwlockwood/karl_data into development
Merge branch 'development' into buffering