Added more consistency with library

I again changed aerospike.md, but I had some issues with GitHub branching (editing things in my fork, my fork on separate branch, etc.) and had to merge everything. 

Changes now include the parameters and return values. I thought I'd change those as well.