Update to add changes from a branch with a bad history. See below for actual commits that were squashed (avoiding duplicate entries).

Squashed commit of the following:

commit b18b553f3ed15df03799754f406d3b6dc8307148
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Wed Nov 19 13:37:20 2014 -0600

    Proper spacing using tabs

commit f2dd12d2cb146a640c936881b94a63aed22c3dbe
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Wed Nov 19 13:29:29 2014 -0600

    Commenting fix

commit e741475f63af954de64c987104049196e2c6d0ce
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Wed Nov 19 13:28:51 2014 -0600

    Syntax fix after rebase with master

commit d0544482de21efde9c8fa834833bbb1adb1d11e6
Merge: be41eff b23cbda
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Wed Nov 19 13:26:12 2014 -0600

    Merge remote-tracking branch 'origin/request-timeout-fix-jasonrobitaille' into request-timeout-fix-jasonrobitaille-2

commit be41efffdfc03c9c97e19e7e0d1041f5d9b19916
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Fri Jul 25 02:19:42 2014 -0500

    Syntax fix

commit 8018145ab3def1d969678804ccda1834cbd6179c
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Fri Jul 25 02:18:22 2014 -0500

    Fix to properly cleanup, and more appropriately error out, in the event of a timeout (when using timeout enyo.Async-inherited functionality).
    Enyo-DCO-1.1-Signed-off-by: Jason Robitaille <jason.robitaille@lge.com>

commit b23cbda26cec0808f8d79f0fad73d55bc9f24e65
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Fri Jul 25 02:19:42 2014 -0500

    Syntax fix

commit 9cbdfc7b1f659c38e706b70458d2201324898c17
Author: Jason Robitaille <robitaille88@gmail.com>
Date:   Fri Jul 25 02:18:22 2014 -0500

    Fix to properly cleanup, and more appropriately error out, in the event of a timeout (when using timeout enyo.Async-inherited functionality).
    Enyo-DCO-1.1-Signed-off-by: Jason Robitaille <jason.robitaille@lge.com>
Merge pull request #35 from enyojs/BHV-17803-coledavis

Dependency of https://github.com/enyojs/enyo-webos/pull/34 for BHV-17803

Reviewed-By: Aaron Tam (aaron.tam@lge.com)
Integrated-By: Cole Davis (cole.davis@lge.com)