Merge feature branch using --squash

Squashed commit of the following:

commit f512ab1b84d38158ce1967a9fb02ae029eae4ff2
Author: Aaron Levy <aaronjlevy@gmail.com>
Date:   Mon Jul 22 16:04:22 2013 -0700

    Modified bar & bat/baz in feature branch