Update README.md
Various fixes including #18, #4, #12
Merge branch 'master' of github.com:joshandrews/Americano
Merge branch 'master' of github.com:joshandrews/Americano

Conflicts:
	README.md