This appears to work
Merge branch 'master' of github.com:meatballhat/maybestatic

Conflicts:
	.gitignore
Adding a teensy .travis.yml