Refactored to use promises
Fixed JSLint errors and one runtime error
Changed Shortcut
Revert "Changed Shortcut"

This reverts commit 81956fb0131fbada9787a2602fe4cd536ea6793d.
Merge remote-tracking branch 'origin/0.1alpha'