Revert "Reverting changes from Josh's push @ 5:50 PM 5/1/2014"

This reverts commit 7ea963382d999b05af4d6b817063b8cf420fb6ff.