Austin EOD 08/20/13

Newest version
Merge branch 'Austin's-Branch'