add more string constants
allow us to use nil progress blocks
Merge branch 'master' into dev
Merge pull request #26 from escherba/dev

Allow setting progress block to nil