Bumped version to 20140825
Merge pull request #161 from jeffposnick/master

Bumped version to 20140825