changing tabs to softtabs
Update README.md
notify over hipchat
Syntax fix
Update
Merge branch 'master' of https://github.com/mjm159/apidocs into manager

Conflicts:
	modules/renter.md
Cleaning and format
Update
Merge pull request #23 from mjm159/manager

Manager
Merge branch 'master' of github.com:knockrentals/apidocs into travis_hipchat_notification
* regenerated token
Merge pull request #21 from jayzeng/travis_hipchat_notification

notify over hipchat
Making some notes
Merge pull request #24 from mjm159/master

Making some notes
added available times to listing calendar
merge
remove hard tabs (atom sucks)
Merge pull request #25 from kieferhagin/listingCalendarAvailableTimes

added available times to listing calendar
Update
fixed json syntax