gh-pages hello world test
Merge branch 'master' into gh-pages

Conflicts:
	index.html
added iss location query errback for debugging; removed callback params from queries
returning callback params; experimenting with proxy configs
more proxy experimenting
commented out proxy in app's config; adjustments to jsonp requests to open-notify
removing proxy files altogether