Merge pull request #1 from royaldark/master

Updating my branch
Merge remote-tracking branch 'upstream/master'
Added properly formatted version number to project.clj
Started testing some of the pretty error code and fixed a bug in errors.dictionaries/best-approximation
Working out changes made upstream
Started to fix indentation in dictionaries.clj
Resolved git conflicts
Merge pull request #7 from fodder008/master

Fixed bug and added tests