Reconciled branch with older master
Reconciled branch with older master

Running specs was failing due to lingering changes from rebase. manually removed changes that this branch did not make by comparing the branch version with the master version.

atom/bracket-matcher