Merge pull request #29 from simplepanda/devel

Merged devel to master (file system serving)
Merge pull request #30 from simplepanda/devel

Merged devel to master
Merge pull request #31 from simplepanda/devel

Merged master into development
Merge pull request #32 from simplepanda/master

Backwards ratification.