Merge pull request #87 from dbeckwith/feature-deck-options

Feature deck options
Merge branch 'team9dev' into feature-deck-options