Merge branch 'jasonbaker/master'

bin/celeryd

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 import sys
+if not '' in sys.path:
+    sys.path.insert(0, '')
 from celery.bin.celeryd import run_worker, parse_options
 
 if __name__ == "__main__":

bin/celeryinit

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-
+import sys
+if not '' in sys.path:
+    sys.path.insert(0, '')
 from celery.bin.celeryinit import main
 
 if __name__ == "__main__":