F483 / dataserv / 2

Builds	Branch	Commit	Type	Ran	Committer	Via	Coverage
2	develop	updated makefile	push	27 Dec 2015 10:31PM UTC	F483	travis-ci	pending completion
1	develop	Merge branch 'master' of github.com:Storj/dataserv into develop Conflicts: dataserv/config.py	push	27 Dec 2015 10:00PM UTC	F483	travis-ci	pending completion