Tweaking requiremnts files.
Remaking fabfile to use shortstack.
Merge branch 'dev'