Merge branch 'dev'
Merge branch 'dev'
Modifying API url's

Changing all URL's to use the ?cmd= format
Merge branch 'patch-1' of https://github.com/jtdrostework/middleman into dev