mergeMerge branch 'develop' of https://github.com/agile-geoscience/modelr
fixed typo
added file deleter"
links
RST, wot dat
merging beta release development
Merge branch 'beta' of https://github.com/agile-geoscience/modelr
version increasing for release
Merge branch 'beta' into develop
fixed some edge cases, removed print statements
merged with beta
added server timeout
Merge branch 'master' into develop
added timeout so hthe whole server won't hang
added threading to the server
modelr/web/server.py