Fixed a few Typos and merged rAthena changes

![time](https://f.cloud.github.com/assets/3421824/144189/eb882004-73fb-11e2-93b3-4a05a0debebb.png)
*When trying to compile on my Mac