refactor for readability
update
Merge remote-tracking branch 'origin/master' into HEAD

merge
Conflicts:
	xively_feed
resolved
Merge branch 'origin/master'
branch rebase
Conflicts:
	xively_feed