Flip merge arrow buttons to undo a merge choice.

Squashed commit of the following:

commit 495c4b5a49b2f42813ee52f88bace0e22c437560
Merge: 5483909 efec3d0
Author: Tavish Armstrong <tavisharmstrong@gmail.com>
Date:   Tue Mar 4 20:37:20 2014 -0500

    Fix merge conflict.

commit 5483909ea5512b2718b10f55946fbcd34d37f911
Author: bsplay <bsplay@github.com>
Date:   Sat Mar 1 14:09:31 2014 -0500

    making jshint happy

commit 31f58e711dce98055df59732d61ae45470671df7
Author: bsplay <bsplay@github.com>
Date:   Sat Mar 1 13:55:39 2014 -0500

    drag/drop changes arrow

commit af8f67db97285cd6f72aa09e86a3fa8bbffdf6bd
Author: bsplay <bsplay@gmail.com>
Date:   Fri Feb 28 13:06:46 2014 -0500

    undo arrow