Updated for ProMotion 2.0
conflicts
HelpScreen
Fix specs
Merge pull request #5 from jamonholmgren/update_for_pm2

Updated for ProMotion 2.0