Merge branch 'develop' of github.com:sdbmich1/plumboard
added parameter to marketplace uri call; added https to s3 protocol to paperclip settings for production
Merge branch 'issue-006' into develop