Minor gitignore update
correction to travis.yml for dependencies
Second go at making travis happy
missing period
fixing cut and paste stupidity.
Merge branch 'master' into feature/python34

Conflicts:
	.travis.yml