Fixes for Python 3.3 and 3.4#21

takluyver wants to merge 3 commits into

srossross:mainsrossross/Meta:mainfrom

takluyver:developtakluyver/Meta:developCopy head branch name to clipboard