1.0 alpha

@johnmcdonnell Rebased things a little for merge into master.