Merge branch 'develop'
Move source files to their own directory

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Merge branch 'hotfix/appengine-setup'
Version bump to force Appengine rebuild

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Fixing AppEngine deploy (for realz)

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Merge branch 'master' into develop