Fixed bitbucket bugs
Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Fix typo in update_style copy command
Merge pull request #1489 from duckpuppy/fix-update_style

Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Merge branch 'master' of github.com:izacus/nothing_here

Conflicts:
	source/_includes/asides/bitbucket.html
Merge remote-tracking branch 'upstream/master'