Updated readme to reflect release of v3.0.4.
Updated build version to v3.0.4.
Updated v3.0 branch to v3.0.5-a1.
Resolved merge conflicts.
Travis build 3517702 pushed to gh-pages
Travis build 3524418 pushed to gh-pages
Travis build 3532418 pushed to gh-pages
Travis build 3534427 pushed to gh-pages
Travis build 3537918 pushed to gh-pages
Travis build 3543300 pushed to gh-pages
Travis build 3543321 pushed to gh-pages
Travis build 3556642 pushed to gh-pages
Travis build 3557427 pushed to gh-pages
Travis build 3593884 pushed to gh-pages
Travis build 3595883 pushed to gh-pages
Travis build 3605417 pushed to gh-pages
Travis build 3612810 pushed to gh-pages
Travis build 3619086 pushed to gh-pages
Travis build 3619320 pushed to gh-pages
Travis build 3639613 pushed to gh-pages