Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Secondary index definition and creation.
Remove timestamp.
minor fix.
Removed more stuff.
Tests.
Index
Merge branch 'master' of github.com:tonyhuang/phoenix