Mostly syntactic cleanups...
Merged with upstream/master; had to "resolve" lots of indentations fixes.
Merged 'upstream/master', version pitched at end of hackathon, so now can clean our quick-and-dirty stuff, finally.
Added proper .gitignore file.
Merge pull request #1 from Modified/master

Just cleanups, merged with "final" (hackathon pitch) version.