Merge pull request #301 from mballance-sf/master

Bug fixes, etc
""
Update for 1.5.5
""
Merge remote-tracking branch 'upstream/master'

Conflicts:
	etc/sveditor.info