Merge branch 'hotfix/2013-08-18' into develop
added support for .pylintrc files
updated README for new .pylintrc options
Merge branch 'master' into develop
Merge branch 'danthedeckie-master' into develop
Bumped version in README
Bumped version to 1.0.0
Merge branch 'release/1.0'