Pull user contributions from a (local atm) proxy service
Merge master into user-contributions
User contributions API
Merge pull request #12 from jamesmcfadden/user-contributions

User contributions
Merge remote-tracking branch 'upstream/master' into gh-pages