Merge pull request #126 from adamwdraper/develop

Develop 1.5.3
Update README.md
Renamed function numeral.language to numeral.locale
Renamed numeral.language to numeral.locale to be more similar to momentjs and corrected tests
Added version 1.5.4 info to README.md and package.json, bower.json
Changed loadLocale to be more similar to momentjs
Added version 1.5.4 info to README.md and package.json, bower.json
Added test to verify that locale() loads locale file properly
Merge branch 'master' of https://github.com/rojo2/Numeral-js
Solved some merge conflicts