Merge branch 'master' of https://github.com/cfitz/america

Conflicts:
	MIT-LICENSE