Merge pull request #245 from CodeFalling/master

new plugin:better alias
Stops theme breaking on root directory
Merge pull request #246 from steeeve/fix-missing-arg-for-root-directory

Stops theme breaking in root directory
new plugin:git-flow