merge curl and wget
add wifi_keys to gitignore
fix wifi_keys
Merge branch 'master' of github.com:krebscode/autowifi

Conflicts:
	TODO
	etc/autowifi/wifi_keys